apps: drop redundant 64-bit casts on tv_sec/tv_nsec arithmetic#3476
Conversation
|
Thank you @xiaoxiang781216 :-) CI failed, restarted :-) There is small typo to fix in |
5902bf8 to
43ab6bf
Compare
Done, but this patch need merge apache/nuttx#18840 first to pass ci. |
cederom
left a comment
There was a problem hiding this comment.
Thank you @xiaoxiang781216 :-)
Conditional approval assuming that apache/nuttx#18840 is merged and this PR builds fine after that :-)
43ab6bf to
6d7f16d
Compare
Now that time_t is unconditionally 64-bit (signed int64_t) and the
struct timespec fields tv_sec / tv_nsec are wide enough on their own,
the explicit (uint64_t)/(int64_t)/(int) casts that used to guard the
multiplications and subtractions in *_us / *_ms / *_ns helpers are no
longer needed. Drop them to keep the timekeeping math readable.
In the same spirit, this commit also normalises the printf-style format
specifiers and casts used to print tv_sec / tv_nsec / tv_usec values.
The prior code was a mix of "%d"/"%u"/"%ld"/"%lu"/"%lld" with matching
(int)/(unsigned long)/(long long) casts; some formats truncated time_t
on 32-bit hosts, others mismatched signedness or width. Replace all
such cases with the portable POSIX-recommended forms:
- tv_sec (time_t, signed, impl-defined width) -> %jd + (intmax_t)
- tv_nsec (long, signed) -> %ld (no cast)
- tv_usec (suseconds_t / long) -> %ld (no cast)
Also drop two stale `(FAR const time_t *)&ts.tv_sec` casts that are
unnecessary now that ts.tv_sec is plain time_t.
Arithmetic-cleanup files (existing scope):
- benchmarks/cyclictest/cyclictest.c: timediff_us()
- benchmarks/sd_bench/sd_bench_main.c: get_time_delta_us()
- examples/oneshot/oneshot_main.c: maxus computation
- examples/watchdog/watchdog_main.c: current_time_ms (x2)
- industry/nxmodbus/nxmb_internal.h: nxmb_util_clock_ms()
- netutils/ntpclient/ntpclient.c: timespec2ntp()
- netutils/ptpd/ptpd.c: ptp_adjtime()
- system/dd/dd_main.c: elapsed accounting
- testing/drivers/drivertest/drivertest_posix_timer.c:
get_timestamp()
- testing/drivers/sd_stress/sd_stress_main.c:get_time_delta()
- testing/sched/getprime/getprime_main.c: elapsed accounting
- testing/sched/pthread_mutex_perf/pthread_mutex_perf.c:
timespec_avg()
Printf-format-fix files (new in this revision):
- examples/adjtime/adjtime_main.c
- examples/charger/charger_main.c
- examples/netpkt/netpkt_ethercat.c
- fsutils/mkfatfs/mkfatfs.c
- graphics/tiff/tiff_initialize.c
- netutils/ptpd/ptpd.c
- nshlib/nsh_timcmds.c
- system/coredump/coredump.c
- system/ptpd/ptpd_main.c
- testing/drivers/drivertest/drivertest_oneshot.c
- testing/mm/kasantest/kasantest.c
- testing/ostest/semtimed.c
- testing/sched/pthread_mutex_perf/pthread_mutex_perf.c
- testing/sched/timerjitter/timerjitter.c
- testing/testsuites/kernel/time/cases/clock_test_clock01.c
- testing/testsuites/kernel/time/cases/clock_test_smoke.c
No behavioural change.
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
6d7f16d to
f061d12
Compare
@cederom this patch can be merged now. |
cederom
left a comment
There was a problem hiding this comment.
Thank you @xiaoxiang781216 amazing work!! :-)
Summary
Follow-up cleanup to the recent
time_t/clock_t64-bit consolidation(commits "drop CONFIG_SYSTEM_TIME64 conditionals" and
"replace sclock_t with clock_t and drop redundant time_t/off_t casts").
NuttX's
time_tis now unconditionally a signed 64-bit type, so theexplicit
(uint64_t),(int64_t), and(int)casts that used to besprinkled around
tv_sec/tv_nsecarithmetic — to avoid 32-bitmultiplication/subtraction overflow back when
time_tcould be 32-bit —are no longer needed. This PR drops those now-redundant casts to keep
the timekeeping helpers readable and consistent with the rest of the
recently-cleaned-up code.
Files touched (one-liners each):
benchmarks/cyclictest/cyclictest.c—timediff_us()benchmarks/sd_bench/sd_bench_main.c—get_time_delta_us()examples/oneshot/oneshot_main.c—maxuscomputationexamples/watchdog/watchdog_main.c—current_time_ms(×2)industry/nxmodbus/nxmb_internal.h—nxmb_util_clock_ms()netutils/ntpclient/ntpclient.c—timespec2ntp()netutils/ptpd/ptpd.c—ptp_adjtime()system/dd/dd_main.c—elapsedaccountingtesting/drivers/drivertest/drivertest_posix_timer.c—get_timestamp()testing/drivers/sd_stress/sd_stress_main.c—get_time_delta()testing/sched/getprime/getprime_main.c—elapsedaccountingtesting/sched/pthread_mutex_perf/pthread_mutex_perf.c—timespec_avg()Impact
compiler (the dropped casts were already no-ops once
time_tbecame 64-bit).
time_t/tv_sec/tv_nsecwidths areunchanged; this PR only removes pleonastic casts.
No behavioural change is intended.
Testing
Build-tested host-side together with the corresponding
nuttx-sidetime_t/clock_tcleanups; the touched helpers all expand to thesame arithmetic as before because the dropped casts no longer
widen anything.
sim:nsh(coversexamples/watchdog,examples/oneshot,system/dd,testing/sched/*,benchmarks/cyclictest,benchmarks/sd_bench,testing/drivers/*)sim:netnsh(coversnetutils/ntpclient,netutils/ptpd,industry/nxmodbus)No new compiler warnings; no functional difference observed in the
benchmark / test outputs before and after the change.